From: Joakim Verona <joakim@verona.se>
Date: Wed, 14 Aug 2013 14:07:18 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=ef7cb56e57e53af78783a85df167f943bd5fe039;p=emacs.git

merge from trunk
---

ef7cb56e57e53af78783a85df167f943bd5fe039